Merge.
authorEwan Mellor <ewan@xensource.com>
Wed, 1 Nov 2006 10:41:44 +0000 (10:41 +0000)
committerEwan Mellor <ewan@xensource.com>
Wed, 1 Nov 2006 10:41:44 +0000 (10:41 +0000)
commitaeade7ad12cc2efefe88d19fb03a62c263aae885
treebb2d46182000450720dad8cdfa9d5a4219104165
parentfb2358c250fbb14d54c8382b963360374647a4eb
parent3369945812356d7f05796fcc68b0f28055d6a13e
Merge.

Signed-off-by: Ewan Mellor <ewan@xensource.com>